Autogenerated HTML docs for v1.7.9.2-302-g3724c
diff --git a/git-pull.html b/git-pull.html index 00f8466..0e53b74 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -721,17 +721,31 @@ <dt class="hdlist1"> --ff </dt> +<dd> +<p> + When the merge resolves as a fast-forward, only update the branch + pointer, without creating a merge commit. This is the default + behavior. +</p> +</dd> <dt class="hdlist1"> --no-ff </dt> <dd> <p> - Do not generate a merge commit if the merge resolved as - a fast-forward, only update the branch pointer. This is - the default behavior of git-merge. + Create a merge commit even when the merge resolves as a + fast-forward. </p> -<div class="paragraph"><p>With --no-ff Generate a merge commit even if the merge -resolved as a fast-forward.</p></div> +</dd> +<dt class="hdlist1"> +--ff-only +</dt> +<dd> +<p> + Refuse to merge and exit with a non-zero status unless the + current <tt>HEAD</tt> is already up-to-date or the merge can be + resolved as a fast-forward. +</p> </dd> <dt class="hdlist1"> --log[=<n>] @@ -786,16 +800,6 @@ option can be used to override --squash.</p></div> </dd> <dt class="hdlist1"> ---ff-only -</dt> -<dd> -<p> - Refuse to merge and exit with a non-zero status unless the - current <tt>HEAD</tt> is already up-to-date or the merge can be - resolved as a fast-forward. -</p> -</dd> -<dt class="hdlist1"> -s <strategy> </dt> <dt class="hdlist1">
